Hi serendipity
I must take issue with something you said about 'blaming teachers' for too many variations...
If you look at the link put up by jj (i'm not sure this is the comp you were referring to) you will see these top guys adapting and improvising to avoid others, and to keep a clear space for themselves.
You only get good at this by working through and developing a wide range of figures and movements. Doesn't mean you have to use these in every comp.
It's the very same with learning to play a musical instrument - you learn with a wide range of musical types - classical, jazz, Scott joplin - the whole lot. That develops skills.
i'm sure you've experienced the fact that the more you learn, the more quickly you can learn new things.
Even at my level, we have a fairly good repertoire at foxtrot, and most of it i don't use in comps, but when we're in trouble i can (on a good day
) find something from somewhere without thinking about it.
Actually i don't have this in tango, and i suffer for it.